Merge from mainline.
authorEli Zaretskii <eliz@gnu.org>
Fri, 5 Feb 2010 14:28:04 +0000 (09:28 -0500)
committerEli Zaretskii <eliz@gnu.org>
Fri, 5 Feb 2010 14:28:04 +0000 (09:28 -0500)
commit000c37a79f467e061d5779b70f6a0a4bc63e5117
tree158feb32f7db1ad0848cd8be6772dc0da219d136
parent918fd127e5b401895492f99cf8562420c9163aea
parentcf37fa163ca6af52858f176d110e1117685fa6e7
Merge from mainline.